ath10k-ct: switch to base 6.18

Switch ath10k-ct kernel version base to 6.18 to align with backports
package based on 6.18 kernel version.

Link: https://github.com/openwrt/openwrt/pull/20964
Signed-off-by: Christian Marangi <[email protected]>

diff --git a/package/kernel/ath10k-ct/Makefile b/package/kernel/ath10k-ct/Makefile
index 1bf5d3d9694ae2a15fe41ed725670c4f092a67e2..7b1543dff31ce381bd73a7ad1d6aaeb118685696 100644 (file)
--- a/package/kernel/ath10k-ct/Makefile
+++ b/package/kernel/ath10k-ct/Makefile
@@ -15,7 +15,7 @@ PKG_MIRROR_HASH:=76a950c4c5f02128f4225955b1ca0d1d8f6c68c3b0918c4bc2d1265698e939a
 # Build the 6.14 ath10k-ct driver version.
 # Probably this should match as closely as
 # possible to whatever mac80211 backports version is being used.
-CT_KVER="-6.14"
+CT_KVER="-6.18"
 
 PKG_MAINTAINER:=Ben Greear <[email protected]>
 PKG_BUILD_PARALLEL:=1

diff --git a/package/kernel/ath10k-ct/patches/002-ath10k-6.10-remove-unsupported-feature.patch b/package/kernel/ath10k-ct/patches/002-ath10k-6.10-remove-unsupported-feature.patch
index f2adce735a502ae69ab6e5d5957c5c05049adf17..1fb99589982beb551ae4098b190e4c5014d5cc8a 100644 (file)
--- a/package/kernel/ath10k-ct/patches/002-ath10k-6.10-remove-unsupported-feature.patch
+++ b/package/kernel/ath10k-ct/patches/002-ath10k-6.10-remove-unsupported-feature.patch
@@ -1,6 +1,6 @@
---- a/ath10k-6.14/mac.c
-+++ b/ath10k-6.14/mac.c
-@@ -11650,7 +11650,6 @@ int ath10k_mac_register(struct ath10k *a
+--- a/ath10k-6.18/mac.c
++++ b/ath10k-6.18/mac.c
+@@ -11686,7 +11686,6 @@ int ath10k_mac_register(struct ath10k *a
        ar->hw->wiphy->n_cipher_suites = ar->hw_params.n_cipher_suites;
  
        wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);

diff --git a/package/kernel/ath10k-ct/patches/003-ath10k-ct-make-it-compatible-with-the-old-LTS-kernel.patch b/package/kernel/ath10k-ct/patches/003-ath10k-ct-make-it-compatible-with-the-old-LTS-kernel.patch
deleted file mode 100644 (file)
index 4f1918c..0000000
--- a/package/kernel/ath10k-ct/patches/003-ath10k-ct-make-it-compatible-with-the-old-LTS-kernel.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Shiji Yang <[email protected]>
-Date: Fri, 28 Mar 2025 19:56:06 +0800
-Subject: [PATCH] ath10k-ct: make it compatible with the old LTS kernel
-
-Rollback some APIs to fix compilation errors.
-
-Signed-off-by: Shiji Yang <[email protected]>
----
- ath10k-6.14/ahb.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/ath10k-6.14/ahb.c
-+++ b/ath10k-6.14/ahb.c
-@@ -842,7 +842,7 @@ static struct platform_driver ath10k_ahb
-               .of_match_table = ath10k_ahb_of_match,
-       },
-       .probe = ath10k_ahb_probe,
--      .remove = ath10k_ahb_remove,
-+      .remove_new = ath10k_ahb_remove,
- };
- 
- int ath10k_ahb_init(void)

diff --git a/package/kernel/ath10k-ct/patches/004-Revert-wifi-ath10k-Use-iommu_paging_domain_alloc.patch b/package/kernel/ath10k-ct/patches/004-Revert-wifi-ath10k-Use-iommu_paging_domain_alloc.patch
index f765950cadb00a0dcb7989446e062b7cc7ae3b4c..5940fd7a1921aa3292cc2e8f82afb63e6d6f9cd0 100644 (file)
--- a/package/kernel/ath10k-ct/patches/004-Revert-wifi-ath10k-Use-iommu_paging_domain_alloc.patch
+++ b/package/kernel/ath10k-ct/patches/004-Revert-wifi-ath10k-Use-iommu_paging_domain_alloc.patch
@@ -7,12 +7,12 @@ IPQ4019 wireless can't start after upstream commit d5b7485588df[1].
 [1] https://github.com/torvalds/linux/commit/d5b7485588dffb39c5687e965623124ab7ebcd51
 Signed-off-by: Shiji Yang <[email protected]>
 ---
- ath10k-6.14/snoc.c | 6 +++---
+ ath10k-6.18/snoc.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
---- a/ath10k-6.14/snoc.c
-+++ b/ath10k-6.14/snoc.c
-@@ -1635,10 +1635,10 @@ static int ath10k_fw_init(struct ath10k
+--- a/ath10k-6.18/snoc.c
++++ b/ath10k-6.18/snoc.c
+@@ -1630,10 +1630,10 @@ static int ath10k_fw_init(struct ath10k
  
        ar_snoc->fw.dev = &pdev->dev;
  

diff --git a/package/kernel/ath10k-ct/patches/005-ath10k-ct-fix-missing-prototypes-warnings-on-6.12-ke.patch b/package/kernel/ath10k-ct/patches/005-ath10k-ct-fix-missing-prototypes-warnings-on-6.12-ke.patch
index 84f3d1896bea97b1292f7f281985dd264b4abfc7..800b17da09b3a130651437874b2709d8bbe2c753 100644 (file)
--- a/package/kernel/ath10k-ct/patches/005-ath10k-ct-fix-missing-prototypes-warnings-on-6.12-ke.patch
+++ b/package/kernel/ath10k-ct/patches/005-ath10k-ct-fix-missing-prototypes-warnings-on-6.12-ke.patch
@@ -7,30 +7,30 @@ Fix various missing-prototypes warnings by:
 * Mark functions only used in current source file as static.
 * Comment out unused functions.
 
-/workspaces/openwrt/build_dir/target-x86_64_musl/linux-x86_64/ath10k-ct-regular/ath10k-ct-2025.03.14~63f5b605/ath10k-6.14/debug.c:425:6: error: no previous prototype for 'ath10k_debug_fw_ratepwr_table_process' [-Werror=missing-prototypes]
+/workspaces/openwrt/build_dir/target-x86_64_musl/linux-x86_64/ath10k-ct-regular/ath10k-ct-2025.03.14~63f5b605/ath10k-6.18/debug.c:425:6: error: no previous prototype for 'ath10k_debug_fw_ratepwr_table_process' [-Werror=missing-prototypes]
   425 | void ath10k_debug_fw_ratepwr_table_process(struct ath10k *ar, struct sk_buff *skb)
       |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-/workspaces/openwrt/build_dir/target-x86_64_musl/linux-x86_64/ath10k-ct-regular/ath10k-ct-2025.03.14~63f5b605/ath10k-6.14/debug.c:437:6: error: no previous prototype for 'ath10k_debug_fw_powerctl_table_process' [-Werror=missing-prototypes]
+/workspaces/openwrt/build_dir/target-x86_64_musl/linux-x86_64/ath10k-ct-regular/ath10k-ct-2025.03.14~63f5b605/ath10k-6.18/debug.c:437:6: error: no previous prototype for 'ath10k_debug_fw_powerctl_table_process' [-Werror=missing-prototypes]
   437 | void ath10k_debug_fw_powerctl_table_process(struct ath10k *ar, struct sk_buff *skb)
       |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-/workspaces/openwrt/build_dir/target-x86_64_musl/linux-x86_64/ath10k-ct-regular/ath10k-ct-2025.03.14~63f5b605/ath10k-6.14/debug.c:884:5: error: no previous prototype for 'ath10k_refresh_target_pdev_ext_ct_stats' [-Werror=missing-prototypes]
+/workspaces/openwrt/build_dir/target-x86_64_musl/linux-x86_64/ath10k-ct-regular/ath10k-ct-2025.03.14~63f5b605/ath10k-6.18/debug.c:884:5: error: no previous prototype for 'ath10k_refresh_target_pdev_ext_ct_stats' [-Werror=missing-prototypes]
   884 | int ath10k_refresh_target_pdev_ext_ct_stats(struct ath10k *ar)
       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-/workspaces/openwrt/build_dir/target-x86_64_musl/linux-x86_64/ath10k-ct-regular/ath10k-ct-2025.03.14~63f5b605/ath10k-6.14/htt_tx.c:1190:6: error: no previous prototype for 'ieee80211_is_robust_mgmt_frame_tx' [-Werror=missing-prototypes]
+/workspaces/openwrt/build_dir/target-x86_64_musl/linux-x86_64/ath10k-ct-regular/ath10k-ct-2025.03.14~63f5b605/ath10k-6.18/htt_tx.c:1190:6: error: no previous prototype for 'ieee80211_is_robust_mgmt_frame_tx' [-Werror=missing-prototypes]
  1190 | bool ieee80211_is_robust_mgmt_frame_tx(struct ieee80211_hdr *hdr)
       |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-/workspaces/openwrt/build_dir/target-x86_64_musl/linux-x86_64/ath10k-ct-regular/ath10k-ct-2025.03.14~63f5b605/ath10k-6.14/wmi.c:3203:5: error: no previous prototype for 'ath10k_wmi_event_txbf_cv_mesg' [-Werror=missing-prototypes]
+/workspaces/openwrt/build_dir/target-x86_64_musl/linux-x86_64/ath10k-ct-regular/ath10k-ct-2025.03.14~63f5b605/ath10k-6.18/wmi.c:3203:5: error: no previous prototype for 'ath10k_wmi_event_txbf_cv_mesg' [-Werror=missing-prototypes]
  3203 | int ath10k_wmi_event_txbf_cv_mesg(struct ath10k *ar, struct sk_buff *skb)
       |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Signed-off-by: Shiji Yang <[email protected]>
 ---
- ath10k-6.14/debug.c | 6 +++---
+ ath10k-6.18/debug.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
---- a/ath10k-6.14/debug.c
-+++ b/ath10k-6.14/debug.c
-@@ -422,6 +422,7 @@ static void ath10k_debug_fw_stats_reset(
+--- a/ath10k-6.18/debug.c
++++ b/ath10k-6.18/debug.c
+@@ -424,6 +424,7 @@ static void ath10k_debug_fw_stats_reset(
        spin_unlock_bh(&ar->data_lock);
  }
  
@@ -38,7 +38,7 @@ Signed-off-by: Shiji Yang <[email protected]>
  void ath10k_debug_fw_ratepwr_table_process(struct ath10k *ar, struct sk_buff *skb)
  {
        size_t sz = skb->len;
-@@ -445,6 +446,7 @@ void ath10k_debug_fw_powerctl_table_proc
+@@ -447,6 +448,7 @@ void ath10k_debug_fw_powerctl_table_proc
        memcpy(ar->debug.powerctl_tbl.data, skb->data, sz);
        complete(&ar->debug.powerctl_tbl_complete);
  }
@@ -46,7 +46,7 @@ Signed-off-by: Shiji Yang <[email protected]>
  
  void ath10k_debug_fw_stats_process(struct ath10k *ar, struct sk_buff *skb)
  {
-@@ -881,7 +883,7 @@ static int ath10k_refresh_target_rx_reor
+@@ -883,7 +885,7 @@ static int ath10k_refresh_target_rx_reor
        return 0; /* fail silently if firmware does not support this option. */
  }
  
@@ -55,9 +55,9 @@ Signed-off-by: Shiji Yang <[email protected]>
  {
        if (test_bit(ATH10K_FW_FEATURE_CUST_STATS_CT,
                     ar->running_fw->fw_file.fw_features))
---- a/ath10k-6.14/htt_tx.c
-+++ b/ath10k-6.14/htt_tx.c
-@@ -1187,7 +1187,7 @@ static u8 ath10k_htt_tx_get_tid(struct s
+--- a/ath10k-6.18/htt_tx.c
++++ b/ath10k-6.18/htt_tx.c
+@@ -1189,7 +1189,7 @@ static u8 ath10k_htt_tx_get_tid(struct s
   * since we do tx hw crypt, and it won't actually be encrypted even when this flag is
   * set.
   */
@@ -66,9 +66,9 @@ Signed-off-by: Shiji Yang <[email protected]>
  {
          if (ieee80211_is_disassoc(hdr->frame_control) ||
              ieee80211_is_deauth(hdr->frame_control))
---- a/ath10k-6.14/wmi.c
-+++ b/ath10k-6.14/wmi.c
-@@ -3200,7 +3200,7 @@ printme:
+--- a/ath10k-6.18/wmi.c
++++ b/ath10k-6.18/wmi.c
+@@ -3206,7 +3206,7 @@ printme:
        return 0;
  }
  

diff --git a/package/kernel/ath10k-ct/patches/202-ath10k-use-tpt-trigger-by-default.patch b/package/kernel/ath10k-ct/patches/202-ath10k-use-tpt-trigger-by-default.patch
index c884777baf949b93758084de1f5d4dc99e3b42c8..cfbc74b32a14d82041a058217188270195d64a4e 100644 (file)
--- a/package/kernel/ath10k-ct/patches/202-ath10k-use-tpt-trigger-by-default.patch
+++ b/package/kernel/ath10k-ct/patches/202-ath10k-use-tpt-trigger-by-default.patch
@@ -9,14 +9,14 @@ traffic.
 
 Signed-off-by: Mathias Kresin <[email protected]>
 ---
- ath10k-6.14/core.h | 4 ++++
- ath10k-6.14/leds.c | 4 +---
- ath10k-6.14/mac.c  | 2 +-
+ ath10k-6.18/core.h | 4 ++++
+ ath10k-6.18/leds.c | 4 +---
+ ath10k-6.18/mac.c  | 2 +-
  3 files changed, 6 insertions(+), 4 deletions(-)
 
---- a/ath10k-6.14/core.h
-+++ b/ath10k-6.14/core.h
-@@ -1707,6 +1707,10 @@ struct ath10k {
+--- a/ath10k-6.18/core.h
++++ b/ath10k-6.18/core.h
+@@ -1712,6 +1712,10 @@ struct ath10k {
        u8 csi_data[4096];
        u16 csi_data_len;
  
@@ -27,9 +27,9 @@ Signed-off-by: Mathias Kresin <[email protected]>
        /* must be last */
        u8 drv_priv[] __aligned(sizeof(void *));
  };
---- a/ath10k-6.14/leds.c
-+++ b/ath10k-6.14/leds.c
-@@ -70,7 +70,7 @@ int ath10k_leds_register(struct ath10k *
+--- a/ath10k-6.18/leds.c
++++ b/ath10k-6.18/leds.c
+@@ -69,7 +69,7 @@ int ath10k_leds_register(struct ath10k *
  
        ar->leds.cdev.name = ar->leds.label;
        ar->leds.cdev.brightness_set_blocking = ath10k_leds_set_brightness_blocking;
@@ -38,9 +38,9 @@ Signed-off-by: Mathias Kresin <[email protected]>
  
        ret = led_classdev_register(wiphy_dev(ar->hw->wiphy), &ar->leds.cdev);
        if (ret)
---- a/ath10k-6.14/mac.c
-+++ b/ath10k-6.14/mac.c
-@@ -11654,7 +11654,7 @@ int ath10k_mac_register(struct ath10k *a
+--- a/ath10k-6.18/mac.c
++++ b/ath10k-6.18/mac.c
+@@ -11690,7 +11690,7 @@ int ath10k_mac_register(struct ath10k *a
        ar->hw->weight_multiplier = ATH10K_AIRTIME_WEIGHT_MULTIPLIER;
  
  #ifdef CPTCFG_MAC80211_LEDS

diff --git a/package/kernel/ath10k-ct/patches/206-ath10k-ct-silence-noisy-log-caused-by-flushing-queue.patch b/package/kernel/ath10k-ct/patches/206-ath10k-ct-silence-noisy-log-caused-by-flushing-queue.patch
index 2f6db1dd2a272f1a602abe93335fc0b6a688c88a..64e0bc839a7fd3ae5c9ae3c941e00d5557e82919 100644 (file)
--- a/package/kernel/ath10k-ct/patches/206-ath10k-ct-silence-noisy-log-caused-by-flushing-queue.patch
+++ b/package/kernel/ath10k-ct/patches/206-ath10k-ct-silence-noisy-log-caused-by-flushing-queue.patch
@@ -7,12 +7,12 @@ frames from the hardware queue. Only developers need to care about it.
 
 Signed-off-by: Shiji Yang <[email protected]>
 ---
- ath10k-6.14/mac.c | 8 ++++----
+ ath10k-6.18/mac.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
---- a/ath10k-6.14/mac.c
-+++ b/ath10k-6.14/mac.c
-@@ -9081,12 +9081,12 @@ static void ath10k_flush(struct ieee8021
+--- a/ath10k-6.18/mac.c
++++ b/ath10k-6.18/mac.c
+@@ -9112,12 +9112,12 @@ static void ath10k_flush(struct ieee8021
          if (vif) {
                  arvif = (void *)vif->drv_priv;
                  vid = arvif->vdev_id;

diff --git a/package/kernel/ath10k-ct/patches/300-fix-fortify-checking-error.patch b/package/kernel/ath10k-ct/patches/300-fix-fortify-checking-error.patch
index 84a74c0d3e569aa436adcd17c380b46c8cd8e18c..41c082626557d01ace6f9e3deaab25b72df29061 100644 (file)
--- a/package/kernel/ath10k-ct/patches/300-fix-fortify-checking-error.patch
+++ b/package/kernel/ath10k-ct/patches/300-fix-fortify-checking-error.patch
@@ -1,5 +1,5 @@
---- a/ath10k-6.14/wmi.h
-+++ b/ath10k-6.14/wmi.h
+--- a/ath10k-6.18/wmi.h
++++ b/ath10k-6.18/wmi.h
 @@ -6310,7 +6310,7 @@ struct qca9880_set_ctl_table_cmd {
        __le32 ctl_len; /* in bytes.  This may be ignored in firmware,
                         * make sure ctl_info data is sizeof(qca9880_power_ctl) */

diff --git a/package/kernel/ath10k-ct/patches/960-0010-ath10k-limit-htt-rx-ring-size.patch b/package/kernel/ath10k-ct/patches/960-0010-ath10k-limit-htt-rx-ring-size.patch
index 31a5161c0a6549845fb396557077dabd8d45da37..cbf790894c7c9b0ee844149a34fcf912ac341b2e 100644 (file)
--- a/package/kernel/ath10k-ct/patches/960-0010-ath10k-limit-htt-rx-ring-size.patch
+++ b/package/kernel/ath10k-ct/patches/960-0010-ath10k-limit-htt-rx-ring-size.patch
@@ -1,5 +1,5 @@
---- a/ath10k-6.14/htt.h
-+++ b/ath10k-6.14/htt.h
+--- a/ath10k-6.18/htt.h
++++ b/ath10k-6.18/htt.h
 @@ -238,7 +238,11 @@ enum htt_rx_ring_flags {
  };
  

diff --git a/package/kernel/ath10k-ct/patches/960-0011-ath10k-limit-pci-buffer-size.patch b/package/kernel/ath10k-ct/patches/960-0011-ath10k-limit-pci-buffer-size.patch
index 6490e3ca9b3b375dfdd9578ba67ee5935462fa76..6746fb5ad67f5a55a35957eee5d81ab3b84be1eb 100644 (file)
--- a/package/kernel/ath10k-ct/patches/960-0011-ath10k-limit-pci-buffer-size.patch
+++ b/package/kernel/ath10k-ct/patches/960-0011-ath10k-limit-pci-buffer-size.patch
@@ -1,6 +1,6 @@
---- a/ath10k-6.14/pci.c
-+++ b/ath10k-6.14/pci.c
-@@ -132,7 +132,11 @@ static const struct ce_attr pci_host_ce_
+--- a/ath10k-6.18/pci.c
++++ b/ath10k-6.18/pci.c
+@@ -133,7 +133,11 @@ static const struct ce_attr pci_host_ce_
                .flags = CE_ATTR_FLAGS,
                .src_nentries = 0,
                .src_sz_max = 2048,
@@ -12,7 +12,7 @@
                .recv_cb = ath10k_pci_htt_htc_rx_cb,
        },
  
-@@ -141,7 +145,11 @@ static const struct ce_attr pci_host_ce_
+@@ -142,7 +146,11 @@ static const struct ce_attr pci_host_ce_
                .flags = CE_ATTR_FLAGS,
                .src_nentries = 0,
                .src_sz_max = 2048,
@@ -24,7 +24,7 @@
                .recv_cb = ath10k_pci_htc_rx_cb,
        },
  
-@@ -168,7 +176,11 @@ static const struct ce_attr pci_host_ce_
+@@ -169,7 +177,11 @@ static const struct ce_attr pci_host_ce_
                .flags = CE_ATTR_FLAGS,
                .src_nentries = 0,
                .src_sz_max = 512,
@@ -36,7 +36,7 @@
                .recv_cb = ath10k_pci_htt_rx_cb,
        },
  
-@@ -193,7 +205,11 @@ static const struct ce_attr pci_host_ce_
+@@ -194,7 +206,11 @@ static const struct ce_attr pci_host_ce_
                .flags = CE_ATTR_FLAGS,
                .src_nentries = 0,
                .src_sz_max = 2048,

diff --git a/package/kernel/ath10k-ct/patches/988-ath10k-always-use-mac80211-loss-detection.patch b/package/kernel/ath10k-ct/patches/988-ath10k-always-use-mac80211-loss-detection.patch
index cc93623ed8ab534516a1c615714c185ff98f7200..cd1d05e8504ddf6168864438990217edd47e97c5 100644 (file)
--- a/package/kernel/ath10k-ct/patches/988-ath10k-always-use-mac80211-loss-detection.patch
+++ b/package/kernel/ath10k-ct/patches/988-ath10k-always-use-mac80211-loss-detection.patch
@@ -13,12 +13,12 @@ own loss detection mechanism.
 
 Signed-off-by: David Bauer <[email protected]>
 ---
- ath10k-6.14/mac.c | 1 -
+ ath10k-6.18/mac.c | 1 -
  1 file changed, 1 deletion(-)
 
---- a/ath10k-6.14/mac.c
-+++ b/ath10k-6.14/mac.c
-@@ -11339,7 +11339,6 @@ int ath10k_mac_register(struct ath10k *a
+--- a/ath10k-6.18/mac.c
++++ b/ath10k-6.18/mac.c
+@@ -11375,7 +11375,6 @@ int ath10k_mac_register(struct ath10k *a
        ieee80211_hw_set(ar->hw, CHANCTX_STA_CSA);
        ieee80211_hw_set(ar->hw, QUEUE_CONTROL);
        ieee80211_hw_set(ar->hw, SUPPORTS_TX_FRAG);